Do not allow an uninitialised VCPU to be brought up. Also

check VCPUOP_up return code in the guest and BUG() on
failure.

Signed-off-by: Keir Fraser <keir@xensource.com>

diff --git a/linux-2.6-xen-sparse/arch/xen/kernel/smpboot.c b/linux-2.6-xen-sparse/arch/xen/kernel/smpboot.c
index 66bb891ec6a7c236519fed306ec0cccd9a2b1cd5..db15eb3dfb5209b296d11df44a97d2ecea46d10c 100644 (file)
--- a/linux-2.6-xen-sparse/arch/xen/kernel/smpboot.c
+++ b/linux-2.6-xen-sparse/arch/xen/kernel/smpboot.c
@@ -410,7 +410,8 @@ int __devinit __cpu_up(unsigned int cpu)
 
        xen_smp_intr_init(cpu);
        cpu_set(cpu, cpu_online_map);
-       HYPERVISOR_vcpu_op(VCPUOP_up, cpu, NULL);
+       if (HYPERVISOR_vcpu_op(VCPUOP_up, cpu, NULL) != 0)
+               BUG();
 
        return 0;
 }

diff --git a/xen/common/domain.c b/xen/common/domain.c
index 7398d79808f890a2c718471aaa06eef0b1a67a2a..430c0b0a8cddb2cedbcc732843398fe07e667a69 100644 (file)
--- a/xen/common/domain.c
+++ b/xen/common/domain.c
@@ -425,7 +425,9 @@ long do_vcpu_op(int cmd, int vcpuid, void *arg)
         break;
 
     case VCPUOP_up:
-        if ( test_and_clear_bit(_VCPUF_down, &v->vcpu_flags) )
+        if ( !test_bit(_VCPUF_initialised, &v->vcpu_flags) )
+            rc = -EINVAL;
+        else if ( test_and_clear_bit(_VCPUF_down, &v->vcpu_flags) )
             vcpu_wake(v);
         break;